3d5779671080895bf486b8ac6ba81f47c174da03,src/com/vgi/mafscaling/OpenLoop.java,OpenLoop,loadLogFile,#,622
Before Change
}
protected void loadLogFile() {
fileChooser.setMultiSelectionEnabled(true);
if (JFileChooser.APPROVE_OPTION != fileChooser.showOpenDialog(this))
return;
boolean isPolSet = polfTable.isSet();
File[] files = fileChooser.getSelectedFiles();
for (File file : files) {
BufferedReader br = null;
ArrayDeque<String[]> buffer = new ArrayDeque<String[]>();
try {
br = new BufferedReader(new FileReader(file.getAbsoluteFile()));
String line = br.readLine();
if (line != null) {
String [] elements = line.split("\\s*,\\s*", -1);
getColumnsFilters(elements, false);
boolean resetColumns = false;
if (logThtlAngleColIdx >= 0 || logAfLearningColIdx >= 0 || logAfCorrectionColIdx >= 0 || logMafvColIdx >= 0 ||
logAfrColIdx >= 0 || logRpmColIdx >= 0 || logLoadColIdx >= 0 || logCommandedAfrCol >= 0) {
if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(null, "Would you like to reset column names or filter values?", "Columns/Filters Reset", JOptionPane.YES_NO_OPTION, JOptionPane.PLAIN_MESSAGE))
resetColumns = true;
}
After Change
br = new BufferedReader(new FileReader(file.getAbsoluteFile()));
String line = null;
String [] elements = null;
while ((line = br.readLine()) != null && (elements = line.split("\\s*,\\s*", -1)) != null && elements.length < 2)
continue;
getColumnsFilters(elements, false);
boolean resetColumns = false;
if (logThtlAngleColIdx >= 0 || logAfLearningColIdx >= 0 || logAfCorrectionColIdx >= 0 || logMafvColIdx >= 0 ||
logAfrColIdx >= 0 || logRpmColIdx >= 0 || logLoadColIdx >= 0 || logCommandedAfrCol >= 0) {